From 019960f1310eea07ab04fdd0726b42f705f431c9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Tue, 11 Oct 2016 14:45:43 +0200
Subject: [PATCH] viewport: remove deprecated api

---
 docs/reference/gtk/gtk4-sections.txt |  4 --
 gtk/gtkviewport.c                    | 80 ----------------------------
 gtk/gtkviewport.h                    | 11 ----
 3 files changed, 95 deletions(-)

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 1d984a324b..fa80023649 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -4983,10 +4983,6 @@ gtk_list_store_get_type
 GtkViewport
 GtkViewportClass
 gtk_viewport_new
-gtk_viewport_get_hadjustment
-gtk_viewport_get_vadjustment
-gtk_viewport_set_hadjustment
-gtk_viewport_set_vadjustment
 gtk_viewport_set_shadow_type
 gtk_viewport_get_shadow_type
 gtk_viewport_get_bin_window
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 58270c84cb..3bfb3f4b1f 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -592,42 +592,6 @@ gtk_viewport_finalize (GObject *object)
   G_OBJECT_CLASS (gtk_viewport_parent_class)->finalize (object);
 }
 
-/**
- * gtk_viewport_get_hadjustment:
- * @viewport: a #GtkViewport.
- *
- * Returns the horizontal adjustment of the viewport.
- *
- * Returns: (transfer none): the horizontal adjustment of @viewport.
- *
- * Deprecated: 3.0: Use gtk_scrollable_get_hadjustment()
- **/
-GtkAdjustment*
-gtk_viewport_get_hadjustment (GtkViewport *viewport)
-{
-  g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
-
-  return viewport->priv->hadjustment;
-}
-
-/**
- * gtk_viewport_get_vadjustment:
- * @viewport: a #GtkViewport.
- * 
- * Returns the vertical adjustment of the viewport.
- *
- * Returns: (transfer none): the vertical adjustment of @viewport.
- *
- * Deprecated: 3.0: Use gtk_scrollable_get_vadjustment()
- **/
-GtkAdjustment*
-gtk_viewport_get_vadjustment (GtkViewport *viewport)
-{
-  g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
-
-  return viewport->priv->vadjustment;
-}
-
 static void
 viewport_set_adjustment (GtkViewport    *viewport,
 			 GtkOrientation  orientation,
@@ -656,50 +620,6 @@ viewport_set_adjustment (GtkViewport    *viewport,
   gtk_viewport_adjustment_value_changed (adjustment, viewport);
 }
 
-/**
- * gtk_viewport_set_hadjustment:
- * @viewport: a #GtkViewport.
- * @adjustment: (allow-none): a #GtkAdjustment.
- *
- * Sets the horizontal adjustment of the viewport.
- *
- * Deprecated: 3.0: Use gtk_scrollable_set_hadjustment()
- **/
-void
-gtk_viewport_set_hadjustment (GtkViewport   *viewport,
-			      GtkAdjustment *adjustment)
-{
-  g_return_if_fail (GTK_IS_VIEWPORT (viewport));
-  if (adjustment)
-    g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-
-  viewport_set_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL, adjustment);
-
-  g_object_notify (G_OBJECT (viewport), "hadjustment");
-}
-
-/**
- * gtk_viewport_set_vadjustment:
- * @viewport: a #GtkViewport.
- * @adjustment: (allow-none): a #GtkAdjustment.
- *
- * Sets the vertical adjustment of the viewport.
- *
- * Deprecated: 3.0: Use gtk_scrollable_set_vadjustment()
- **/
-void
-gtk_viewport_set_vadjustment (GtkViewport   *viewport,
-			      GtkAdjustment *adjustment)
-{
-  g_return_if_fail (GTK_IS_VIEWPORT (viewport));
-  if (adjustment)
-    g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-
-  viewport_set_adjustment (viewport, GTK_ORIENTATION_VERTICAL, adjustment);
-
-  g_object_notify (G_OBJECT (viewport), "vadjustment");
-}
-
 /** 
  * gtk_viewport_set_shadow_type:
  * @viewport: a #GtkViewport.
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index 8b0bef0e18..9fb2abf713 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -80,17 +80,6 @@ GDK_AVAILABLE_IN_ALL
 GtkWidget*     gtk_viewport_new             (GtkAdjustment *hadjustment,
 					     GtkAdjustment *vadjustment);
 
-GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_hadjustment)
-GtkAdjustment* gtk_viewport_get_hadjustment (GtkViewport   *viewport);
-GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_vadjustment)
-GtkAdjustment* gtk_viewport_get_vadjustment (GtkViewport   *viewport);
-GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_hadjustment)
-void           gtk_viewport_set_hadjustment (GtkViewport   *viewport,
-                                             GtkAdjustment *adjustment);
-GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_set_vadjustment)
-void           gtk_viewport_set_vadjustment (GtkViewport   *viewport,
-                                             GtkAdjustment *adjustment);
-
 GDK_AVAILABLE_IN_ALL
 void           gtk_viewport_set_shadow_type (GtkViewport   *viewport,
 					     GtkShadowType  type);
-- 
2.30.2